From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 14 Oct 2015 12:30:11 +0000 (+0000)
Subject: Merge "Add recentChangesLine to ChangesList"
X-Git-Tag: 1.31.0-rc.0~9399
X-Git-Url: http://git.cyclocoop.org//%22http:/%22.attribut_html%28%24lesurls%5B%24numero%5D%29.%22/%22?a=commitdiff_plain;h=0b635582a32873159eeecbbc59033a86345a43b1;hp=34659b0b42100cb8f61eef7cd1682c554fb1a39c;p=lhc%2Fweb%2Fwiklou.git

Merge "Add recentChangesLine to ChangesList"
---

diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index fdc9944fdc..01f10d8110 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -76,6 +76,21 @@ class ChangesList extends ContextSource {
 		}
 	}
 
+	/**
+	 * Format a line
+	 *
+	 * @since 1.27
+	 *
+	 * @param RecentChange $rc Passed by reference
+	 * @param bool $watched (default false)
+	 * @param int $linenumber (default null)
+	 *
+	 * @return string|bool
+	 */
+	public function recentChangesLine( &$rc, $watched = false, $linenumber = null ) {
+		throw new RuntimeException( 'recentChangesLine should be implemented' );
+	}
+
 	/**
 	 * Sets the list to use a "<li class='watchlist-(namespace)-(page)'>" tag
 	 * @param bool $value
diff --git a/includes/changes/EnhancedChangesList.php b/includes/changes/EnhancedChangesList.php
index 1dcb7aef48..f10307db79 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -83,15 +83,16 @@ class EnhancedChangesList extends ChangesList {
 	/**
 	 * Format a line for enhanced recentchange (aka with javascript and block of lines).
 	 *
-	 * @param RecentChange $baseRC
+	 * @param RecentChange $rc
 	 * @param bool $watched
+	 * @param int $linenumber (default null)
 	 *
 	 * @return string
 	 */
-	public function recentChangesLine( &$baseRC, $watched = false ) {
+	public function recentChangesLine( &$rc, $watched = false, $linenumber = null ) {
 
 		$date = $this->getLanguage()->userDate(
-			$baseRC->mAttribs['rc_timestamp'],
+			$rc->mAttribs['rc_timestamp'],
 			$this->getUser()
 		);
 
@@ -106,7 +107,7 @@ class EnhancedChangesList extends ChangesList {
 			$this->lastdate = $date;
 		}
 
-		$cacheEntry = $this->cacheEntryFactory->newFromRecentChange( $baseRC, $watched );
+		$cacheEntry = $this->cacheEntryFactory->newFromRecentChange( $rc, $watched );
 		$this->addCacheEntry( $cacheEntry );
 
 		return $ret;